Revision: bazaar--merge--1.1--patch-15
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Tue Jan  4 16:28:06 EST 2005
Standard-date: 2005-01-04 05:28:06 GMT
New-files: po/.arch-ids/ca.po.id po/.arch-ids/da.po.id
    po/.arch-ids/es_ES.po.id po/.arch-ids/fr_FR.po.id
    po/.arch-ids/nl.po.id po/.arch-ids/pt_BR.po.id
    po/.arch-ids/zh_CN.po.id po/ca.po po/da.po po/es_ES.po
    po/fr_FR.po po/nl.po po/pt_BR.po po/zh_CN.po
New-directories: .arch-ids
Renamed-files: libarch/star-merge.c libarch/merge.c
    libarch/star-merge.h libarch/merge.h
Modified-files: baz/baz.c commands/apply-changeset.c
    commands/lint.c commands/merge.c commands/status.c
    libarch/archive-mirror.c libarch/archive.c
    libarch/cached-archive.c libarch/merge.c libarch/my.c
    libarch/my.h libarch/proj-tree-lint.c
    libarch/proj-tree-lint.h po/cy.po po/es.po
    po/etc/messages.pot tests/test-changes.sh
    tests/test-mirror.sh
New-patches: aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-5
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-6
    rob.weir@canonical.com--2004-public/baz--bug4889--0--base-0
    rob.weir@canonical.com--2004-public/baz--bug4889--0--patch-1
    rob.weir@canonical.com--2004-public/baz--bug4889--0--patch-2
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-48
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-49
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-50
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-51
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-52
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-53
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-54
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-55
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-56
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-57
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-58
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-59
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-15
    thelove@canonical.com/bazaar--devo--1.1--patch-62
    thelove@canonical.com/bazaar--devo--1.1--patch-63
    thelove@canonical.com/bazaar--devo--1.1--patch-64
    thelove@canonical.com/bazaar--devo--1.1--patch-65
    thelove@canonical.com/bazaar--devo--1.1--patch-66
    thelove@canonical.com/bazaar--devo--1.1--patch-67
Summary: merge from robert.collins@canonical.com/bazaar--devel--1.1
Keywords: 

Patches applied:

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-5
   Merge from thelove

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-6
   Fixed memory allocation error

 * rob.weir@canonical.com--2004-public/baz--bug4889--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-63

 * rob.weir@canonical.com--2004-public/baz--bug4889--0--patch-1
   Apply patch from James Hentridge to use size_t instead of int.

 * rob.weir@canonical.com--2004-public/baz--bug4889--0--patch-2
   Sync up with THELOVE.

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-48
   merge from thelove@canonical.com/bazaar--devo--1.1

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-49
   Merge in latest translations : Catalan, Chinese, Danish, Dutch, Frence, Portuguese, Spanish

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-50
   fix up the es_ES template

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-51
   update messages.pot, and fix typo in apply-changeset.c

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-52
   merge from rf

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-53
   rename libarch/star-merge to libarch/merge

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-54
   fix tree_version leak in merge

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-55
   fix leak in i18n setup

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-56
   merge from thelove@canonical.com/bazaar--devo--1.1

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-57
   remove lint chatter that interferes with piping

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-58
   refactor the inventory linting and status generation to allow separate invocation, use this to allow status to lint before doing changes, but to still show the lint output after the changes. Fixes: bug #4581

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-59
   use a default uid for archive transactions when required. uids are not unique to instances of baz, so this is safe. fixes: #3220

 * thelove@canonical.com/bazaar--devo--1.1--patch-62
   new merge algorithm that deals with tags and cycles more sanely that star-merge

 * thelove@canonical.com/bazaar--devo--1.1--patch-63
   Merge in latest translations : Catalan, Chinese, Danish, Dutch, Frence, Portuguese, Spanish

 * thelove@canonical.com/bazaar--devo--1.1--patch-64
   Fixed error in memory allocation for cached archives

 * thelove@canonical.com/bazaar--devo--1.1--patch-65
   Fixed error in memory allocation for cached archives (for real)

 * thelove@canonical.com/bazaar--devo--1.1--patch-66
   Use size_t instead of int in one case, to fix a build failure on amd64 (#4889).

 * thelove@canonical.com/bazaar--devo--1.1--patch-67
   Use size_t instead of int, fixing a build failure on amd64 (thanks James Henstridge, #4889).  Archive-mirror'ing this time.

